From ef6409ae1b5540fdb581817e5a56f47b140b73c8 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Tue, 15 Dec 2015 14:14:00 +0100 Subject: [PATCH] build: convert HAS_SCIF use to Kconfig Use the Kconfig generated CONFIG_HAS_SCIF defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- config/arm32.mk | 1 - xen/drivers/char/Kconfig | 9 +++++++++ xen/drivers/char/Makefile | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/config/arm32.mk b/config/arm32.mk index b1de8dabe7..001b2cd9c4 100644 --- a/config/arm32.mk +++ b/config/arm32.mk @@ -9,7 +9,6 @@ CONFIG_XEN_INSTALL_SUFFIX := # Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb: CFLAGS += -marm -HAS_SCIF := y HAS_MEM_ACCESS := y # Use only if calling $(LD) directly. diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig index a424ab2901..c81b109df0 100644 --- a/xen/drivers/char/Kconfig +++ b/xen/drivers/char/Kconfig @@ -40,3 +40,12 @@ config HAS_OMAP help This selects the Texas Instruments OMAP UART. If you have a Texas Instruments based CPU, say Y. + +# SuperH SCI(F) UART support +config HAS_SCIF + bool + default y + depends on ARM_32 + help + This selects the SuperH SCI(F) UART. If you have a SuperH based board, + say Y. diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile index 7118570d0f..f9d9a9ca59 100644 --- a/xen/drivers/char/Makefile +++ b/xen/drivers/char/Makefile @@ -4,7 +4,7 @@ obj-$(CONFIG_HAS_CADENCE_UART) += cadence-uart.o obj-$(CONFIG_HAS_PL011) += pl011.o obj-$(CONFIG_HAS_EXYNOS4210) += exynos4210-uart.o obj-$(CONFIG_HAS_OMAP) += omap-uart.o -obj-$(HAS_SCIF) += scif-uart.o +obj-$(CONFIG_HAS_SCIF) += scif-uart.o obj-$(HAS_EHCI) += ehci-dbgp.o obj-$(CONFIG_ARM) += dt-uart.o obj-y += serial.o -- 2.30.2